From d17ba1d30a71b01617e3f49e98e6560cc7274b89 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 7 Sep 2010 19:29:03 +0200
Subject: [PATCH] eventbox: Merge paint function into expose function

---
 gtk/gtkeventbox.c | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c
index a8ba01c889..b527395b24 100644
--- a/gtk/gtkeventbox.c
+++ b/gtk/gtkeventbox.c
@@ -57,8 +57,6 @@ static void     gtk_event_box_size_request  (GtkWidget        *widget,
                                              GtkRequisition   *requisition);
 static void     gtk_event_box_size_allocate (GtkWidget        *widget,
                                              GtkAllocation    *allocation);
-static void     gtk_event_box_paint         (GtkWidget        *widget,
-                                             GdkRectangle     *area);
 static gboolean gtk_event_box_expose        (GtkWidget        *widget,
                                              GdkEventExpose   *event);
 static void     gtk_event_box_set_property  (GObject          *object,
@@ -564,30 +562,20 @@ gtk_event_box_size_allocate (GtkWidget     *widget,
     gtk_widget_size_allocate (child, &child_allocation);
 }
 
-static void
-gtk_event_box_paint (GtkWidget    *widget,
-		     GdkRectangle *area)
+static gboolean
+gtk_event_box_expose (GtkWidget      *widget,
+		     GdkEventExpose *event)
 {
-  if (!gtk_widget_get_app_paintable (widget))
+  if (gtk_widget_get_has_window (widget) &&
+      !gtk_widget_get_app_paintable (widget))
     gtk_paint_flat_box (gtk_widget_get_style (widget),
                         gtk_widget_get_window (widget),
 			gtk_widget_get_state (widget),
                         GTK_SHADOW_NONE,
-			area, widget, "eventbox",
+			&event->area, widget, "eventbox",
 			0, 0, -1, -1);
-}
-
-static gboolean
-gtk_event_box_expose (GtkWidget      *widget,
-		     GdkEventExpose *event)
-{
-  if (gtk_widget_is_drawable (widget))
-    {
-      if (gtk_widget_get_has_window (widget))
-	gtk_event_box_paint (widget, &event->area);
-
-      GTK_WIDGET_CLASS (gtk_event_box_parent_class)->expose_event (widget, event);
-    }
+  
+  GTK_WIDGET_CLASS (gtk_event_box_parent_class)->expose_event (widget, event);
 
   return FALSE;
 }
-- 
2.30.2